Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorWolfgang Denk <[email protected]>
Sat, 24 Apr 2010 19:25:42 +0000 (21:25 +0200)
committerWolfgang Denk <[email protected]>
Sat, 24 Apr 2010 19:25:42 +0000 (21:25 +0200)

Trivial merge